From 09239601fd7de529e82e8db0c62c0187c0cef9ce Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Feb 2005 13:39:47 +0000 Subject: [PATCH] Revert the last change, since gtk_widget_set_style_internal() already 2005-02-23 Matthias Clasen * gtk/gtklabel.c (gtk_label_style_set): Revert the last change, since gtk_widget_set_style_internal() already queues a resize. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtklabel.c | 4 +++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 77c160bebb..0b6170b285 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * gtk/gtklabel.c (gtk_label_style_set): Revert the last + change, since gtk_widget_set_style_internal() already + queues a resize. + 2005-02-23 Matthias Clasen * gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 77c160bebb..0b6170b285 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * gtk/gtklabel.c (gtk_label_style_set): Revert the last + change, since gtk_widget_set_style_internal() already + queues a resize. + 2005-02-23 Matthias Clasen * gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 77c160bebb..0b6170b285 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * gtk/gtklabel.c (gtk_label_style_set): Revert the last + change, since gtk_widget_set_style_internal() already + queues a resize. + 2005-02-23 Matthias Clasen * gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index e45bd1fd23..f1d2cee47a 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2008,6 +2008,7 @@ gtk_label_size_request (GtkWidget *widget, requisition->width = width + rect.width; requisition->height = height + rect.height; + return; } else @@ -2081,8 +2082,10 @@ gtk_label_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { GtkLabel *label; + GtkLabelPrivate *priv; label = GTK_LABEL (widget); + priv = GTK_LABEL_GET_PRIVATE (widget); (* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation); @@ -2129,7 +2132,6 @@ gtk_label_style_set (GtkWidget *widget, /* We have to clear the layout, fonts etc. may have changed */ gtk_label_clear_layout (label); - gtk_widget_queue_resize (GTK_WIDGET (label)); } static void -- 2.30.2